From 6fd2fc155af10c0c21a8cda6e0e2a2147ebbda35 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 1 Sep 2006 01:25:15 +0100 Subject: [PATCH] [XEN] Improve Xen information in register dumps. Signed-off-by: Keir Fraser --- xen/arch/x86/x86_32/traps.c | 29 +++++++++++++++++++++-------- xen/arch/x86/x86_64/traps.c | 25 +++++++++++++++++-------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index 49b17b3793..90e799a78c 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -21,11 +21,28 @@ /* All CPUs have their own IDT to allow int80 direct trap. */ idt_entry_t *idt_tables[NR_CPUS] __read_mostly; +static void print_xen_info(void) +{ + char taint_str[TAINT_STRING_MAX_LEN]; + char debug = 'n', *arch = "x86_32"; + +#ifndef NDEBUG + debug = 'y'; +#endif + +#ifdef CONFIG_X86_PAE + arch = "x86_32p"; +#endif + + printk("----[ Xen-%d.%d%s %s debug=%c %s ]----\n", + xen_major_version(), xen_minor_version(), xen_extra_version(), + arch, debug, print_tainted(taint_str)); +} + void show_registers(struct cpu_user_regs *regs) { struct cpu_user_regs fault_regs = *regs; unsigned long fault_crs[8]; - char taint_str[TAINT_STRING_MAX_LEN]; const char *context; if ( hvm_guest(current) && guest_mode(regs) ) @@ -57,9 +74,7 @@ void show_registers(struct cpu_user_regs *regs) fault_crs[4] = read_cr4(); } - printk("----[ Xen-%d.%d%s %s ]----\n", - xen_major_version(), xen_minor_version(), xen_extra_version(), - print_tainted(taint_str)); + print_xen_info(); printk("CPU: %d\nEIP: %04x:[<%08x>]", smp_processor_id(), fault_regs.cs, fault_regs.eip); if ( !guest_mode(regs) ) @@ -132,7 +147,6 @@ asmlinkage void do_double_fault(void) { struct tss_struct *tss = &doublefault_tss; unsigned int cpu = ((tss->back_link>>3)-__FIRST_TSS_ENTRY)>>1; - char taint_str[TAINT_STRING_MAX_LEN]; watchdog_disable(); @@ -140,9 +154,8 @@ asmlinkage void do_double_fault(void) /* Find information saved during fault and dump it to the console. */ tss = &init_tss[cpu]; - printk("*** DOUBLE FAULT: Xen-%d.%d%s %s\n", - xen_major_version(), xen_minor_version(), xen_extra_version(), - print_tainted(taint_str)); + printk("*** DOUBLE FAULT ***\n"); + print_xen_info(); printk("CPU: %d\nEIP: %04x:[<%08x>]", cpu, tss->cs, tss->eip); print_symbol(" %s\n", tss->eip); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 5b8924a26a..0c2a0f3ebc 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -21,11 +21,24 @@ #include +static void print_xen_info(void) +{ + char taint_str[TAINT_STRING_MAX_LEN]; + char debug = 'n'; + +#ifndef NDEBUG + debug = 'y'; +#endif + + printk("----[ Xen-%d.%d%s x86_64 debug=%c %s ]----\n", + xen_major_version(), xen_minor_version(), xen_extra_version(), + debug, print_tainted(taint_str)); +} + void show_registers(struct cpu_user_regs *regs) { struct cpu_user_regs fault_regs = *regs; unsigned long fault_crs[8]; - char taint_str[TAINT_STRING_MAX_LEN]; const char *context; if ( hvm_guest(current) && guest_mode(regs) ) @@ -55,9 +68,7 @@ void show_registers(struct cpu_user_regs *regs) fault_regs.gs = read_segment_register(gs); } - printk("----[ Xen-%d.%d%s %s ]----\n", - xen_major_version(), xen_minor_version(), xen_extra_version(), - print_tainted(taint_str)); + print_xen_info(); printk("CPU: %d\nRIP: %04x:[<%016lx>]", smp_processor_id(), fault_regs.cs, fault_regs.rip); if ( !guest_mode(regs) ) @@ -133,7 +144,6 @@ asmlinkage void double_fault(void); asmlinkage void do_double_fault(struct cpu_user_regs *regs) { unsigned int cpu, tr; - char taint_str[TAINT_STRING_MAX_LEN]; asm ( "str %0" : "=r" (tr) ); cpu = ((tr >> 3) - __FIRST_TSS_ENTRY) >> 2; @@ -143,9 +153,8 @@ asmlinkage void do_double_fault(struct cpu_user_regs *regs) console_force_unlock(); /* Find information saved during fault and dump it to the console. */ - printk("*** DOUBLE FAULT: Xen-%d.%d%s %s\n", - xen_major_version(), xen_minor_version(), xen_extra_version(), - print_tainted(taint_str)); + printk("*** DOUBLE FAULT ***\n"); + print_xen_info(); printk("CPU: %d\nRIP: %04x:[<%016lx>]", cpu, regs->cs, regs->rip); print_symbol(" %s", regs->rip); -- 2.30.2